background: Remove noise texture

Use the plain background color.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/2174
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872

diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
index cc9caef0a39ad5d21cd28a8a86bb198c47470f43..c846b9cef34a540fe389e7a851a1111c02760350 100644 (file)
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -18,7 +18,6 @@
     <file alias="icons/message-indicator-symbolic.svg">message-indicator-symbolic.svg</file>
     <file>no-events.svg</file>
     <file>no-notifications.svg</file>
-    <file>noise-texture.png</file>
     <file>pad-osd.css</file>
     <file alias="icons/eye-open-negative-filled-symbolic.svg">eye-open-negative-filled-symbolic.svg</file>
     <file alias="icons/eye-not-looking-symbolic.svg">eye-not-looking-symbolic.svg</file>

diff --git a/data/theme/gnome-shell-sass/widgets/_screen-shield.scss b/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
index 2c45589aca0f25e55e59a3deaf0bcccbf316dbb1..6928be9fb541f5848dc04a807ca463a4fdb0fc9c 100644 (file)
--- a/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
+++ b/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
@@ -55,8 +55,7 @@
 }
 
 #lockDialogGroup {
-  background: lighten(#2e3436, 8%) url(resource:///org/gnome/shell/theme/noise-texture.png);
-  background-repeat: repeat;
+  background-color: lighten(#2e3436, 8%);
 }
 
 #unlockDialogNotifications {

diff --git a/data/theme/noise-texture.png b/data/theme/noise-texture.png
deleted file mode 100644 (file)
index 6b70a2d..0000000
Binary files a/data/theme/noise-texture.png and /dev/null differ

diff --git a/js/ui/background.js b/js/ui/background.js
index f7506dec4b2a5aa8213fe49131f7ee9a7ab26750..ddae0de873aa6315cdbddcde0d61e941b4546fd3 100644 (file)
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -504,12 +504,9 @@ var SystemBackground = GObject.registerClass({
     Signals: { 'loaded': {} },
 }, class SystemBackground extends Meta.BackgroundActor {
     _init() {
-        let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png');
-
         if (_systemBackground == null) {
             _systemBackground = new Meta.Background({ meta_display: global.display });
             _systemBackground.set_color(DEFAULT_BACKGROUND_COLOR);
-            _systemBackground.set_file(file, GDesktopEnums.BackgroundStyle.WALLPAPER);
         }
 
         super._init({
@@ -518,22 +515,11 @@ var SystemBackground = GObject.registerClass({
             background: _systemBackground,
         });
 
-        let cache = Meta.BackgroundImageCache.get_default();
-        let image = cache.load(file);
-        if (image.is_loaded()) {
-            image = null;
-            let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
-                this.emit('loaded');
-                return GLib.SOURCE_REMOVE;
-            });
-            GLib.Source.set_name_by_id(id, '[gnome-shell] SystemBackground.loaded');
-        } else {
-            let id = image.connect('loaded', () => {
-                this.emit('loaded');
-                image.disconnect(id);
-                image = null;
-            });
-        }
+        let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
+            this.emit('loaded');
+            return GLib.SOURCE_REMOVE;
+        });
+        GLib.Source.set_name_by_id(id, '[gnome-shell] SystemBackground.loaded');
     }
 });